Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 11 Jun 2010 12:14:41 +0000 (12:14 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 11 Jun 2010 12:14:41 +0000 (12:14 +0000)
commit8c166926ac0daabb58fcc518c116c902d86ac76e
tree062b7886fc998f284936b7b0300b70d3017d9be1
parentcae42dc5f32aaaae329e2875ed0ef0165727068b
parent59409a38aa820a2e92659036005dd148b66d7027
Merge from mainline.